Merge "Fixed DataStore related issue and cleaned up pom"