Re #8579. Making Mads' small change.
Merge remote branch 'origin/bugfix/8579_scd_small_bug'