#3574556: Add missing schema elements

Closes #3574556

Merge request reports

Loading