Merge changes from Azure:dev - Nov 24th