Merge remote-tracking branch 'toy/delete_message'