Remove dateAsString related changes in branch 2.
Merge branch 'branch_2'