Update to Kotlin M6