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