This PR resolves #140548. It's based on my work in #118067.
Attach a file by drag & drop or click to upload
