Fix broken scans due to bad merge.
Merge branch 'hotfix/broken_scans'
Merge tag 'broken_scans' into development

hotfix/broken_scans