[sr-dev] git:master: handle all cases after auth_api.pre_auth call