Merge "Light grey APIs." into pi-dev