Merge "Trying to fix flaky TAPL test on CF" into tm-qpr-dev