#KT-29405 Fixed (cherry picked from commit d022bb0248) Original commit: bd4d9491ba28eb87e0c2f347823d419eec100ca9
d022bb0248