Merge "Added several changes in data stack"