Added fix for EPR 397932, 392206, 397524
Merge pull request #181 from avinashcpandey/develop

Added fix for EPR 397932, 392206, 397524