Merge-request: KT-MR-8229 Merged-by: Vladimir Sukharev <Vladimir.Sukharev@jetbrains.com>
Fixes https://youtrack.jetbrains.com/issue/KT-43987 Fixes https://youtrack.jetbrains.com/issue/KT-43989