Merge branch 'jn/branch-lift-unnecessary-name-length-limit'