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