Merge D+D memory management fixes