@rhys @rfriedman,
Any chance you could look into this issue?
Note that we have a similar discussion here.