Merge branch 'mkoller/measurementvalues' into dev

Change-Id: I984246ef160e6ed2713f74a44d454c47c42f43ae