Merge "Inverted the new data stack flag" into tm-dev