Merge "Add several module owners to the whitelist"