Merge remote-tracking branch 'kc/new/bug_6312' into kcmaster