cherry-pick !6389

Xaver Huglrequested to merge
work/zamundaaa/cherry-pick into Plasma/6.2

CCBUG: 493165 (cherry picked from commit f9d8af03)

Merge request reports