Merge remote-tracking branch 'alip/find_message-v3'