Merge "Cleanup message file documentation"