Fix scan identifier prefixing
Merge branch 'master' into cffi