Merge pull request #1295 from Azure/andrew/fix_5_6_26