Fix [JACKSON-829]

6 files changed