We are merging the changes from the Azure M8 branch to ensure all changes are captured in master before migrating to M10
