[complete #72399962] Complete message functionality
Merge branch 'feature/72399962' into develop