Merge "Calculate correct checksum." into tm-dev