(cherry picked from commit 4e68339783b47b0780e1b9aee643404339d35ed1) # Conflicts: # CHANGELOG.md # gradle/libs.versions.toml