Merge "cma: fix migration mode"