Merge "Improve resilience of testSplitFromOverview()" into tm-qpr-dev