I've been aware of this issue for some time—Waqar has asked for my assistance previously.
The problem from our perspective is that the issue is a WPML issue. There is an internal ticket in the WPML project for this, and while I'm in daily contact with the Toolset developers to flag issues, I don't have the same interaction with WPML.
Naturally they have any number of issues to deal with, and prioritise, though for this particular issue there are only two clients reporting it (yourself and another in WPML support).
Concerned about the amount of time it was taking for this to be worked upon I raised it myself with the Head of Support (for both WPML and Toolset) a couple of weeks ago, and they intervened and confirm that the ticket is now added to the board for the next main WPML update, version 4.8.1, and has a priority of critical.
I can't say when that release is due, I'm afraid, all I can do is re-assure you that when you have been requesting progress from Waqar we have in fact been busy behind the scenes trying to get a resolution for this issue from our WPML colleagues.
It's taking too long, I'm sure you are frustrated, and I'm sorry for that.