Merge branch 'new/enh/bug_5917' into kcmaster