Merge "Add better error message when fold bounds are incorrect." into udc-qpr-dev