Fixes #4316 Adding new --skip-idsites option