Merge remote-tracking branch 'kc/new/bug_6497' into kcmaster