Re #8592. Copied over Art's changes.
Re #8592. Forgot to define a variable.
Merge remote branch 'origin/feature/8592_scd_norm'