EPR 401184 and EPR 401188
Merge pull request #211 from avinashcpandey/develop

EPR 401184 and EPR 401188