Fix merge conflicts/build errors
Merge pull request #5705 from wmtan/FixMergeConflicts

Fix merge conflicts/build errors