Resolve #3590817 "Follow ui patterns"

Closes #3590817

Merge request reports

Loading