Merge branch 'ws/single-file-cone' into maint-2.39