Merge "Completely detach old data stack" into tm-dev