NXP-11074: Add TODO
NXP-11073: Add TODO
NXP-11074: Fix possible null item in top level children
Add log for the update from remote case
NXP-11110: Perform a remote recursive scan when updating a document
NXP-11074: Avoid NPE
Merge branch 'master' into 5.6.0