Add module skipping support ("skip" setting)
Merge skip