Merge remote branch 'colin/QA/bug_4506' into new/enh/bug_4506