Normalize reservation tokens
Merge remote-tracking branch 'origin/ttm'