SSP-1147 - Persistence Fixes/Optimizations for Templates