Merged in support-for-skip