Follow-up from "Multifile editor"

The following discussion from !12198 (merged) should be addressed:

• @DouweM started a discussion:

  TODO: Pull into serializer/entity