pk skip scan
Merge remote-tracking branch 'ryang-sfdc/skip-scan' into skip-scan