Fix UT
Merge branch 'deletes' into upgradesdk
Merge branch 'upgradesdk' into appsettings