Merge "DMI Data AVC to use kafka headers"