code for TC12310
Merge branch 'origin/SQLAdmin_Ranga'
Merge branch 'origin/development-sqladmin'