Re #8592. Forgot to define a variable.
Merge branch 'feature/8592_scd_norm' into develop