Merge "Merge ag/3722536 from master to pi-dev." into pi-dev