Closes #16151 by merging a rebased version of it that adds docs and 1 more assertion.
Attach a file by drag & drop or click to upload
