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