Merge branch '2023-11-01-bootstd-fixes'

- Four patches to address issues with bootstd flows in some cases