Merge "Forward HAT and ConfirmationToken to TA on finish." into sc-dev