Merge branch 'jc/maint-t7406-rev-parse-max-count-huh' into maint-1.7.11