Merge "Change var to val in SensorLocation object" into main