Merge "Fixes for ProvisioningTest" into main