INF-2799 #comment Fixed bug where wrong version of source key was being
used in the stashed template #time 5m