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