Merge pull request #526 from Maaack/fix-project-paths-overrides