Patch PR for "extra params optimization"