Merge "ApiSandbox: Better handling of parsed messages"