Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63' * commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63': Removed the device type checking
Merge commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63' * commit '20f8fcd9fe2a1c034113431ecbab8aa03114bb63': Removed the device type checking