Merging dse work into mainline 1.1 branch