Merge branch 'ClientUpgrade' into development