Merge "Use correct attribute name." into pi-dev