Merging scanner into 3.6-dev

Merging scanner into 3.6-dev