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

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