Fix backwards compatibility for keys with value null
Merge branch 'nullManagementInKeyPath'