Issue #3362728: Fix schema errors

Merge request reports