Added deviceType (Bug 42438)
Merge branch 'release-2.4.1' into release-3.0.0