Merge "Make sure DPC knows if revoke fails" into sc-dev