Don't offer the user Blueprints
Merge branch 'master' into envelope
Add basic test for envelope