Merge remote branch 'kc/master' into new/bug_5817