Merge "Fix incompatibilities with Kotlin 1.5.0"