Update to Kotlin post M5.2