Merge remote-tracking branch 'kc/new/awaiting_qa/bug_6316' into kcmaster