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