Merge remote-tracking branch 'refs/remotes/origin/main'

* refs/remotes/origin/main:
  Further refine bootstrap methods
  Add test for new bootstrapping method

Author: mkstratos