Re #7858. Use test framework to see if things have changed.
Merge remote branch 'origin/bugfix/7858_broken_scd'