partial merge from master master
small change in boundingbox interface to reduce API overhead