Apply patch + add test + schema and update code

Merge request reports

Loading