Merge "Fixed several data issues"