Merge branch 'jk/interpret-branch-name' into maint