DFE 2.065 merge