Merge branch 'patch-1' into 'bvh_enhancement'

Init NumberOfShapes.

See merge request !1