Merge "Remove outdated code comments in MessagesXx.php files"