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