Re #8326. Add some testing.
Merge branch 'bugfix/8326_live_run_number' into develop