Merge "Fix more compile error/warnings for gcc-13" into devel/master