Basically the changes from https://github.com/cosmos/ibc-go/pull/6644 and https://github.com/cosmos/ibc-go/pull/6923