Fix builds for 1.8.7

Merge request reports

Loading