Merge branch 'backport-3.20-presets-build-fixes' into presets-build-fixes