Currently the generation of the \u0001Ole marker entry is duplicated on a few places. This patch finds a new home for that code.
applied via r1819706