Merge remote-tracking branch 'kc/master' into new/bug_6350

No match.