missing defice types (Bug 38406)
Merge branch 'release-3.0.0' into release-3.2.0