Tweaks to ProviderJSON output
Merge branch 'my'