PIM-1555 Switch all entities from bundle as it's atomic (either all annotations or all file mapping)