Merge "Add ability to configure force_raw_images param"