Sync with 14.11 release of JE