RIM template added for both Controller and Worker
Merge remote-tracking branch 'origin/master'