Merge remote branch 'magnus/bug3644-normarc' into new/pending_qa/enh/bug_3644