Cherry pick from d1581174c1: Fixed SKIP handling