create_message 1/2
Merge remote-tracking branch 'origin/eugriner' into newFernando