Merge "Disambiguate buildForm docs, add TODO"