Great! Thanks for your suggestion. Yole of Jetbrains team also showed me that there is already a request created in youtrack to address this issue. See
https://youtrack.jetbrains.com/issue/KT-11551 for details. Looking forward to the clean solution implemented by Jetbrains.