Merge branch 'upstream-KWSys' into ci-fedora-38

* upstream-KWSys:
  KWSys 2023-05-22 (df6f93a4)