Merge branch 'add_name' into working
Merge branch 'msg_fixes' into working