HEADS-UP: merging dp2mp-move into trunk ASAP now