Trunk version is correct. I'l be reviewing some of the messages and hopefully they'll be committed later. Many thanks. Let's consider this issue closed.
