Merge "Remove timeout from fingerprint generateChallenge" into sc-dev