Merge remote-tracking branch 'origin/feature/7393_mcstas_event'
Re #6771 cleaned up. new branch.
Merge branch 'feature/6771_ILL_D33' into develop