Merge "Add new 10x10 bounding box config option" into udc-qpr-dev