Merge "Updates for const->constexpr" into devel/master