Merge "More light grey APIs." into pi-dev