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