I can't put to 5.12 as it seems https://phabricator.kde.org/D9325 didn't get into the 5.12 branch, and I don't want two versions of this patch. May I cherry-pick that commit to 5.12 and apply this patch?