Re #8143. Added live data support
Merge remote branch 'origin/feature/8143_live_prenexus'