Merge branch 'sb/branch-attributes'