Remember to update EE whitelists in a separate commit