Merge branch 'rs/clear-commit-marks-cleanup' into maint-2.39