This is a temporary fix. NOTE: Backporting the patch to next-mr.
Attach a file by drag & drop or click to upload
