Merge branch 'stable' into bugfix/16730-have-reproducible-build-attempt-use-same-commit-as-first-build
