base box optimizations
Merge branch 'feature-base-box-optimizations'