(cherry picked from commit 66a938779df1e1400125b987c23c29ac411dda6d) # Conflicts: # gradle/libs.versions.toml