Merge remote-tracking branch 'origin/bpgp' into bpgp

# Conflicts:
#	MacrobenchmarkSample/gradle/libs.versions.toml
