Feature/box adaptive

Merged Martin Schneider requested to merge feature/box-adaptive into master

Merge request reports