Removed "token_pair" usage, remove direct references to exiter object buffers in many places.
Merge branch 'sam_ksi_token_pair' into next