[Backport 8.12] Fix serialisation of empty and single item Fields
instances
#8026
+16
−2
Fields
instances
#8026