update main-with-bazel from main branch