Merge branch 'jk/alias-in-bare' into maint