[MERGE] Forward-port 7.0 up to 9411a2da