Merge pull request #1751 from martinbudden/bf_sensor_tidy