Re #9958. Fixed to the unit test. Temporarily disabled a test.
Merge branch 'feature/9958_livedata_isis_features' into develop