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