Re #8143. Added live data support
Merge branch 'feature/8143_live_prenexus' into develop