Hi, please have a go against latest HEAD and let me know if it works. I tried with annotations at the beginning of a section, of a paragraph, in the middle of a paragraph, at the end of a paragraph and at the end of a section. The fix qualifies as the Most Ugly Hack On Earth, but does the job for me.
Thanks, -- Bastien