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