Follow up fixes from !1890
What does this Merge Request do and why?
This MR fixes the issues identified at !1890 (comment 532015028) and !1890 (comment 532015029).
Merge Request checklist
-
This change is backward compatible. If not, please include steps to communicate to our users. -
Tests added for new functionality. If not, please raise Issue to follow-up. -
Documentation added/updated, if needed. -
gdk doctor
test added, if needed. -
Add the ~highlight
label if this MR should be included in theCHANGELOG.md
.