20 Commits (bugfix/KERNEL-11409-jackson)