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