merged other branches in auth_api

merged other branches in auth_api branch.