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

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