Merge branch 'hw/commit-advise-while-rejecting' into maint