Fix compilation error caused by merge error
Merge pull request #4942 from wmtan/FixCompilationError

Fix compilation error caused by merge error