Push r97515 into 1.18