Merge branch 'katmai-ddr-gda'