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