Update to newly released forms library
Fix test suite to match new forms work
Merge branch 'release/v3.1.4'