Merge branch 'jh/maint-do-not-track-non-branches' into maint