Fixed some memory allocation bugs
Fixed bug where custom templates were destroyed multiple times
Merged
Merged