Some more work on [JACKSON-227]

6 files changed