Merge branch 'bugfix/9618_instrument_view_segfault_usage_examples' into develop