Cbl rnallur/master

Changes to support sink_protocol_info