Backports for ee-2112 Closes #34716 See merge request !12671
Attach a file by drag & drop or click to upload