Sort DepositChannel
Merge branch 'master' into api_v2