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