fix type conversion issue in TextProperty
Merge branch 'datastore-orm-model' into dev