Craig, we have been working on addressing this issue actively for the past month, and the fix is targeted for our Q3 release (early September). The fix is quite involved, so there are no plans to backport this into the Brooklyn Q2 release, the fix will only be distributed as part of the Q3 release.
