Merge branch 'master' into add-scans