[IMP] Pull from UpStream #hg/85:355ff0aa1b2e