Port of fix/29125-ee to CE Closes #29125 See merge request !10796
Attach a file by drag & drop or click to upload
