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