Merge branch 'jc/do-not-feed-tags-to-clear-commit-marks' into maint