Changes related to tkt 9999
Merge https://github.com/prem1981/prasanna-project