Finishe i62 about Allow more properties to be updated
Merge branch 'i62' into wip