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