[MERGE] Forward-port 8.0 up to d706adb