Merge "Remove build warning for gcc-11" into devel/master