re-apply IScope elimination
fix compilation in plugin
merge master into IScope elimination
fix references and make
make project
make project