Merge "Add measurement system" into main