JSR_308 - Fix for 313524
4 files changed