bug fixes

cherry picked from !2123 (merged)

Merge request reports

Loading