Cherry pick from 12fe5e05d6: Added support for SKIP