#KT-44644 Fixed (cherry picked from commit aa683d3b2a) Original commit: ef3c73554fc64d9837019ed9cf9e512bbd2b20f3
aa683d3b2a