Added deviceType (Bug 42438)
Merge branch 'release-2.4.1' into release-3.0.0
Merge branch 'release-3.0.0' into release-3.2.0
Merge branch 'release-3.2.0' into release-3.3.0
Merge branch 'release-3.4.0'
Added new deviceTypes (Bug 42438)