Bug XXXXXXX: Handle TB session events

No bug for this PR.