new bootstrap dropping check blocks appropriately
merge ast fix from spinnaker
intermediate merge, a wizard would squahs this
Merge branch 'new-world' into ann-check