8.0 fix form errors

Merged Eric Horvat requested to merge 8.0-FIX-form-errors into 8.0-stage

Merge request reports