take out empty value attributes
Merging origin/jane/master-pending-submitform into master