cherry-picked #19981