Merged in the Azure repositories