cherry-pick MR 497 from master
Compare changes
+ 6
− 8
@@ -65,13 +65,11 @@ include:
@@ -231,8 +229,8 @@ azure_test:
Original MR: !497 (merged)
Issue: Remember to link the workitem to this pull request.
(If it’s long, please paste to https://ghostbin.com/ and insert the link here.)