Create a rebased patch for #18885

#18885 (moved)

Parent ticket: #20680 (moved)

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information