Merge "Stabilize bubble tests" into udc-qpr-dev