Revert "Trimmed the branch to only the voxel_grid sub directory"

This reverts commit b1e61a24126db9a5f5aa226c8f81f2df970d8265.
Rebase from 'upstream'
Trimmed the branch to only the voxel_grid sub directory