TW-31068
(cherry picked from commit e51d33d)