View refactorings (part 2) - The metadata sorts back

António Fernandesrequested to merge
wip/antoniof/view-refactor-part2 into main

See commit messages.

Merge request reports