am 41e53901: New dev_types and other minor adjustments.

* commit '41e539010df1fa58abf6b57959ea30a05ff80102':
  New dev_types and other minor adjustments.