Fixed 2 properties names found: 'fieldtempate' to 'fieldtemplate'
Merge branch 'rperello/master' into dev