Set up tests for validating MAX errors (EB-6962), partial errors, etc.
Merge remote-tracking branch 'upstream/master'