Update schema + settings

Closes #3570112

Merge request reports

Loading