Fix stackable blueprints
Merge pull request #1760 from Prototik/blueprints-stack

Fix stacking of blueprints
Merge branch '6.0.x' into 6.1.x