Merge "Change Ellipse values to old bounding box" into udc-dev