Make schema reflect actual storage

Closes #3601901

Merge request reports

Loading