Blueprints: Add support for collections
Merge remote-tracking branch 'origin/develop' into develop