Merge "Do not call credential if authenticators does not allow" into main