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