Re #8592. Copied over Art's changes.
Merge branch 'feature/8592_scd_norm' into develop