Merge "Attempts fixing test flakiness" into udc-qpr-dev