[638] Fix gcc16 638#20848

dpiparo wants to merge 2 commits intoroot-project:v6-38-00-patchesroot-project/root:v6-38-00-patchesfrom

dpiparo:fix_gcc16_638dpiparo/root:fix_gcc16_638Copy head branch name to clipboard