Merge "add a Skip option"