Merge "Adding new sensor types."