Merge "CDD: Require checking the primary authentication periodically" into oc-dev