Merge branch 'an/branch-config-message'