Merge "Improve checkAndGetAuthenticators"