Port MR560 to fix gcc 13.2 compiling issues

Port MR560 to fix gcc 13.2 compiling issues

Merge request reports

Loading