NAF2 migration & CMSTT combination