Basically the changes in https://github.com/cosmos/ibc-go/pull/6253. (I will probably open a PR after is https://github.com/cosmos/ibc/pull/1090 merged).