[PATCH] OCIL content generation fixup