WIP
Merge remote-tracking branch 'caasi/compose' into compose
* Fix bounding box calculation so each component is counted separately