devil: add universal option

Fixes #26000.
Merge remote-tracking branch 'upstream/master'