location, ScanError updates
Merge branch 'dev' into tcuje