Merge "Fix utc compile error for gcc-11" into devel/master