Draft: #3496257 pre simplification

Closes #3496257

Merge request reports

Loading