Cherry pick from f07159010c: SKIP now working after adding stop on skip