yet more work on [JACKSON-756]

8 files changed