Is there going to be a fix for this issue? We're running into the same problem, same versions, upgrading from 2.4.5 to 2.6.1.