Merge branch 'new/enh/bug_5579' into kcmaster