revert merge from domain_auth branch
5 files changed