Merge "Remove old benchmark tests" into udc-qpr-dev