update master-with-bazel from main branch