Merge "Get rid of double measure" into tm-dev