Merge "Allow sensors list to be empty" into main