r1767 + adjusted renderObjectTags() draft