Merge "Fix SnapshotTaskTests" into tm-dev