[#1656] Fix IndexOutOfBoundsException in MessageToMessageException
Merge remote-tracking branch upstream/$:{upbranch}