Cherry pick #2472

#2472