Draft: #3230397 Normalize the way core does.

Closes #3230397

Merge request reports

Loading