make sure the form row is rendered completely (since "hidden" is the parent, the row is not rendered by default)
Merge branch '2.1'