fix borked merge, rename fields to better match what they do, change setting default to true for #13653
Attach a file by drag & drop or click to upload
