Synced to new image ops HEAD