Issue #2182345: Included Email Value tokens not included in template unless checked in configuration.
Issue #2195583 by DanChadwick: Submission token values duplicating in custom email template.