Merge pull request #8909 from MrPetovan/task/ex_auth