Issue #3449175: revert constraing to match D10 core

Closes #3449175

Merge request reports

Loading