It's already optional in the spec. For mulit-tenant provisioning we want it to be optional as well. Related: #1597