Merged everything from dm2e-task into thi