Merge "Remove default from image_ref options"