Use modal for scanning
Merge branch 'jira/2547' into feature/orbis