Merge branch 'callout_smtp_tpt_merge'