Merge branch 'jc/branch-in-use-error-message'