Since I have not heard back, I am marking this issue as fixed. The relevant fix will be part of version 1.3.6/1.4.6.

Please report back regarding the success or failure of the fix.