46196dc1a3
#KT-45323 Fixed
(cherry picked from commit 9970851684)
Original commit: d8b85debe6afe3af52a234717934aad5289d2b71