added todo reminder to remove short-circuit failure
added todo reminder to remove short-circuit failure

datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador,datawire/ambassador