Merge remote branch 'kc/new/pending_qa/enh/bug_3644' into kcmaster