CSPACE-6422: Maintain the current template when creating new from existing.
Merge pull request #243 from ray-lee/CSPACE-6422

CSPACE-6422