Updated how we deploy with optional apps
Merge remote-tracking branch 'origin/optional-app-deploy' into staging