Merge changes from Case fork into DCE repository