Continuing DDI-import, preparing for test release.