Fixed merge error: cherry picked ef83d28