Merge branch 'jc/maint-1.6.4-show-branch-default' into maint