Merge branch 'upstream-KWSys' into remove-write-only-dir

# By KWSys Upstream
* upstream-KWSys:
  KWSys 2023-11-29 (433f3d23)