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

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