Merge branch 'jc/maint-do-not-switch-to-non-commit' into maint