Merge remote branch 'kc/master' into new/enh/bug_5917