Rebase from 'release/hydro/geometric_shapes'
Placing debian template files