Added cross-zone templates support