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

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