Merge "Revert^2 "Fix incompatibilities with Kotlin 1.5.0""