Dear Harijsi,
This can be solved using the patch I posted here:
Please let me know.
Best regards, Cosmin