Merge origin with fork. Update "update" message to send notifications correctly.