added new scanner flag
Merge branch 'tmp'