Merge "refactor preciseDataState"