Re #9958. Fix Linux and Mac tests.
Merge branch 'feature/9958_livedata_isis_features' into develop