Merge "Add headers for new sensors"