feat: #3565542 Replace custom constraint

By: bluegeek9

Closes #3565542

Merge request reports

Loading