Merge "Amend package whitelist." into pi-dev