Updated branch-6-2 autotest