Resolve #3583785 "Fix guardrail and"

Closes #3583785

Merge request reports

Loading