(cherry picked from commit 235a587e427adca893a4cbfd483b2e712a667af8) # Conflicts: # gradle/kotlinx.versions.toml