Cherry pick of 22633 to master