OPAL-2047 - Bootstrapified MVP
Merge pull request #309 from kazoompa/bug-OPAL-2047

OPAL-2047 - Bootstrapified MVP