changes for MS AZURE & Tablet Deployment