Merge "DMAAP changes"