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