Merge remote-tracking branch 'origin/v1.7'
Merge branch 'v1.7'
Merge branch 'v1.7'
Merge branch 'v1.7'
2079: refactor
2080: start focus on Box gen