Merge pull request #211 from avinashcpandey/develop

EPR 401184 and EPR 401188
Fixed EPR#401184 and 401188
Fixed EPR#401184 and 401188 across all the iterators.