Merge "Missed setting default values" into pi-dev