Merge "Some more members for the light greylist." into pi-dev