Cleaning up old generated files and upgrade configuration for new tools
Merge branch 'master' into new-project-wizard