Cherry picked

0276ab9ed2f399298aed6fadf92eb5efa9205e23