Merge "Account for unseen constraint combinations." into main