Starting to work on [JACKSON-132]

13 files changed