Bug fix for SkipScan intersect
Merge remote branch 'upstream/master'