Feature/zen 14197

Almost all XML changes in this pull are trivial.

See: devices.xml:11535 for the desired changes.