Changes related to tkt 9898
Final Commit
Merge https://github.com/prem1981/prasanna-project