Merge "Fix some history issues" into tm-dev