Merge "Prevent fingerprint from bypassing work challenge" into oc-dev