Resolve #3576852 "Reduce schema bloat"

Closes #3576852

Merge request reports

Loading