For testing purposes, we want to cheat and make all users opted in by default at all times.
Merge remote-tracking branch 'origin/master'