Fix/box

Merged Kilian Weishaupt requested to merge fix/box into next

Merge request reports