Re #6811. Missed an override.
Merge branch 'feature/6811_monitorlivedata_races' into develop