Implemented cherry-picking templates to debug. refs #515