Merge "Add remaining whitelisted controllers" into pi-dev