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