While looking though this I stumbled on this one. I thought it looked a lot like the join one, but that turns out not to be the case, but when I looked at the old SET_LINEIN_BODY_TEMPLATE it contains ``x-rincon-stream`` instead of ``x-rincon``. I don't know if that was one of the bug you mentioned that you fixed or if there is a problem.