Merge "Client response checking for orchestration service"