Merge "Revert "Add methods to mark some constraints as optional."" into main