Merge "Add methods to mark some constraints as optional." into udc-dev