OZF-112: Allowing interop with non-HAL folder format