PR for jdg-6.4.x here: https://github.com/infinispan/jdg/pull/179
PR for jdg-6.3.x here: https://github.com/infinispan/jdg/pull/180
Tests for this are passing for JDG 6.3.1.ER1. BZ remains open until verification with 6.4.0.
OK for 6.4.0 ER1