Patch for XALANJ-2204
6 files changed