Resolve #3562060 "Follow up render ui"

Closes #3562060

Merge request reports

Loading