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