Hello Katarina, pushed your patch to 3-4 with my sign-off. I think you're right and this needs some clean-up. Just for everyone: the commit log contains the wrong bug number in master and 3-4 branch. Kohei, I think, as this is mostly your area, you might want to have a closer look at the whole code around the offset problem. Regards, Markus 