Rebase from 'release/hydro/voxel_grid'
Placing rpm template files