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