Implement [JACKSON-717]

5 files changed