Merge "Added --skip option to skip services."