I added a message (reverse-merged from commit 845da23e4e922f9a6d76bfe45b8ccc989da353a4)