Add MOTD support
Merge