jsr308 branch - Fix for 157847
3 files changed