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