Move ddl changes to 2.3.