Merging develop into main

• Workaround for https://youtrack.jetbrains.com/issue/IDEA-317355
• Workaround for https://youtrack.jetbrains.com/issue/IDEA-317355
• Workaround for https://youtrack.jetbrains.com/issue/IDEA-317355

merged

mentioned in commit a9688018