Collapsing the DP3 related branches.