Merge branch 'msgfromself'