- Update system email app/theme root resolution to be done prior to merging field data (only resolve template)