Fix preventMakefileRebuild
Merge branch 'master' into preventMakfileByDefault