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

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