Changes to related ticket T1234
Changes related to tkt 4567
Merge https://github.com/prem1981/prasanna-project