Required for [CMP-5046](https://youtrack.jetbrains.com/issue/CMP-5046)
Supersedes #1162 with a cleaned-up and fixes

---------
Co-authored-by: Luc Girardin <luc.girardin@macrofocus.com>