Merge "Careful process validation for unaware providers." into nyc-dev