Merge "SensorData constructors cleanup" into main