Fix n+1
Better 422 error message
Merge remote-tracking branch 'upstream/master'