JSR_308 - Fix for 293861
2 files changed