fix EPR 398167, 398501 + documentation fixes
Merge pull request #192 from avinashcpandey/develop

fix EPR 398167, 398501 + documentation fixes