Merging latest scanner work into 3.6 dev

Merging latest scanner work into 3.6 dev
@ymotov The Xcode auto generated header needs to be removed.