Merge "Adding support for new sensor types"