Previously, the setting was only applied to values. This worked for POJOs but had no effect on maps. Fixes gh-48343