Merge branch 'exchange_id'