status completed and not completed changes implemented
conflicts resolved
Merge pull request #1878 from ssushma/dev-branch

status completed and not completed changes implemented