^KT-54792 Fixed ^KT-54801 ^KT-54800
Merge-request: KT-MR-8457 Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>