Re #8630. It is actually just an 'else'
Merge remote-tracking branch 'origin/bugfix/8630_small_scd'