Blueprint omnibus

This consolidates changes form #1215 and #1309. Posted for another round of review, mostly so @spearway can verify that these are his intended changes. This merge was performed by @kriskowal and @Stuk sharing a screen.