Fix and add backwards compatibility

Merge request reports

Loading