[Reviewer: Andy] Add in trail

Can you review this (exciting) change to add in the trail

Tested by comparing SAS traces before and after the change

Fixes #679