Merge branch 'dev' into mkoller/measurementvalues

Change-Id: Iddcf63299f20505427123a08c1ac50eac2de41a8