update main-with-bazel from master branch