Merge origin/dev into fix/kibitzer-shutdown-and-wake-bounds