Integrated changes from AzureRT