Fix Build
Merge branch 'dev-blobs' of github.com:robertsmieja/wpi-suite-tng into dev-iteration5-attachment-merge