box changes in v3 that i forgot
Merge remote-tracking branch 'origin/v3-boxchanges' into 7.x-1.x