Switch to S110 and wrap all ADV stuff in precompiler excludes
Merge remote-tracking branch 'refs/remotes/origin/master'