Roc template

Merge roc_template branch into master.