- Brought template emulator uptodate with 7.18+