Fixes to scanning logic
Merge remote-tracking branch 'origin/master'