(cherry picked from commit 8df9bce1b4ab2e38f1e1180093c51d7fe6ce4405) # Conflicts: # gradle/kotlinx.versions.toml