Merge "Check that a bubble exists before reordering it" into udc-qpr-dev