Merge "Updated after const -> constexpr changes" into devel/master