Resolved EPRs - 400650 and 400651
Merge pull request #209 from rkskvk/new_develop

Resolved EPRs - 400650 and 400651