User defined messages
Merge branch 'upstream_master'