Update azure/master with latest changes from tjanczuk/master