Merge pull request #2255 from clemensg/sensors_support_current