Fixed EPRs 391661 391719 391786 392102 392103 392206 392207 392208
Merge pull request #140 from avinashcpandey/develop

Fixed EPRs 391661 391719 391786 392102 392103 392206 392207 392208