Rebase from 'release/indigo/combine_dr_measurements'
Placing rpm template files