OPAL-2047 - Bootstrapified MVP