honour elementFormDefault for objects, too
Merge upstream changes