Compilation fix for EPR 394905
Merge pull request #156 from avinashcpandey/develop

Compilation fix for EPR 394905