Fix/add scanning

Merged Donald Chen requested to merge fix/addScanning into master

Merge request reports