Merge branch 'develop' into feature/JAL-4274_configurable_bitmap_export_preferences