4320: Avoid duplication of columns

Merged Simon Barner requested to merge 4230 into master

Merge request reports