Beta 9: Bootstrap hotfix