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