Merge based on Steve Grant's PR

This moves the provisioning block to a 1.2+ version.