[#3556325] feat: Fix schema errors

By: smustgrave

Closes #3556325

Merge request reports

Loading