Merge "Enable new data stack by default" into tm-dev