Draft: #3467967 and #2582157 combined

Merge request reports

Loading