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