JSR_308 - Fix for 293861
4 files changed