Fix issues that comes while testing test-0.3.7-b

Merge request reports

Loading