b12b4e4e32
Re-add double underscores in derive (fixes #32292) @durka, sanity-check, please? <s>Don't merge this yet, I need to add a test and test it locally.</s> ready for review