Merge "Revert "DO NOT MERGE temporarily disabled new data stack""