Merge commit '63e2c0ab3b3cfac68ed3832adfbf4e5a0b32ed8f' into eclair-mr2 * commit '63e2c0ab3b3cfac68ed3832adfbf4e5a0b32ed8f': Log for issue 2203561.