merged MS_MOVE/ctx_t code with HEAD