Re #8569. Fixing the linux/mac builds.
Merge branch 'feature/8569_instrument_view_starting_point' into develop