Ref cbed1039c47f0e3487cea555bb8552a4e6445f5a (cherry picked from commit f59d6c1306c2a2e3548ca5a9b48cb60996fab581)