compatibility fixes for default branch before 10.4.0

Merge request reports

Loading