Unreverts #54902 with fixes for a failing integration test.
Attach a file by drag & drop or click to upload
