JSR_308 - Fix for 153429
6 files changed