Merge branch 'pw/message-cleanup'