Draft: Fixes for issues seen in !59025

Tagging @tadej

Merge request reports

Loading