Revert to TCS for api-response/command-reply to remove race conditions - can't be done using Rx style code.