Merge "support humidity sensor type"