Added to Messages in the shared folder
Merged changes