JSR_308 - Fix for 313524
5 files changed