Merge "Validate sensor name before storing" into main