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