[REFACTOR] Improve implementation of generic content editing

And pave the way to the multi-editing.

Change-Id: I1a9f5483196a250c23013b54e30fecd3a17aa809
Releases: 0.4.0
Resolves: #59405