Closes #16773 by merging a tweaked version of it. [skip sauce]
Attach a file by drag & drop or click to upload
