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