Merge remote branch 'kc/new/bug_6065' into kcmaster