Merge "Fix the Wenum-constexpr-conversion error" into main