Merge "Change static const to static constexpr" into main