Merge "Removed old data stack"