Merge pull request #9520 from ronald-cron-arm/restore-all-ref-configs-testing

Restore testing of all reference configs