Comment 8 for bug 1335023

Can someone please review the changes? Some CI tests are failing, but I've verified that for other open requests also they've failed, and the their logs doesn't suggest any issue related to the current changes being submitted.