XD-1388: Upgrade to batch M3
Fix comment
XD-1378: create tcp-client options

apply to tcp sink
Use a separate option for direct buffers