Opt in communication

Move opt in communication to master.