Merge "Fast bounding-box clipping feature" into devel/master