Merge "Add initial values for properties" into pi-dev