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