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

This reverts commit 322e5f5fecf8e8ca9087f661452fff17ab5969b3.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the voxel_grid sub directory