Issue #3551525 by mably: Other schema fixes

Closes #3551525

Merge request reports

Loading