Merge "More greylisted APIs." into pi-dev