Updated Valid constraint reference

Revised PR #4351 for 2.3 branch