2308: Fix BoxSpec
Merge branch 'v1.7dev' into v1.7