Add lines dropped in bad git merge
Merge pull request #6900 from wmtan/FixCompilationErrorsFroBadGitMerge

Add lines dropped in bad git merge to fix massive compilation errors