sync msautotest branch-6-2