fix: Resolve some schema issues (#3594376)

Closes #3594376

Merge request reports

Loading