(cherry picked from commit 1dc4a52f61661ff271ad2e0485399991e35f9dc8) # Conflicts: # gradle/libs.versions.toml