Implement basic templates versions
CLI
#3145
+184
−4
Merged