#KT-43605 Fixed (cherry picked from commit 70d434e992) Original commit: bb558c528239070d82f439c8c797ff38dc655a8d
70d434e992