Merge "Fix DDM reply buffer deallocation"