Backport SOFIE fixes in 6.32#15847

lmoneta merged 3 commits intoroot-project:v6-32-00-patchesroot-project/root:v6-32-00-patchesfrom

lmoneta:backport_632_sofielmoneta/root:backport_632_sofieCopy head branch name to clipboard