Merge branch 'new/enh/bug_4877'