ERT-510 - Advanced toggle for simulation pages
Merge remote-tracking branch 'origin/ERT-510' into ERT-510