Issue #3336928: Update design

Closes #3362384

Merge request reports

Loading