GRAS-1343 Error modal now lists the first error
Merge remote-tracking branch 'origin/joust' into joust