Merge "Retrieve authenticatorId when already targetUserId" into sc-dev