Reverted solution with shared TcpCommand in ClientApi and Core back to copy-pasting :(.