Synced to image_ops HEAD