Hi Martin, Thanks for the improvement! Can you push the fix to the 2.2.x branches, 2.2.15.final? Thanks Emily