fix(design)

Vink, S.A. (Sjoerd)requested to merge
fix/design into main

Transfer some commits from design branch

Merge request reports