Also adding a patch to easily identify and reapply them.
Attach a file by drag & drop or click to upload
