[MERGE] Forward-port 8.0 up to 494ecc6