Merge branch 'mkoller/measurementvalues' into dev

Change-Id: I3cb303f0e4d27bfd5a14c2d2999acf51755c46f4