Merge with DDR changes