Merge branch 'ks/branch-tweak-error-message-for-extra-args'