Verified with EAP 6.4.18.CP.CR1 Note: the fix causes a issue BZ1509183
Released on Nov 14 2017 as part of EAP 6.4.18.