Merge remote-tracking branch 'origin/bugfix/9458_fix_display_mask_for_added_data'
Refs #9113 - Remove unused file.
Merge branch 'feature/9113_remove_unused_example_file' into develop