Merge "precisedataState refactor part 3"