User preferences - communications
Merge branch 'user-comms-opt' into dev