Cleanup.
Cleanup.
Cleanup.
Add SystemMessageTemplates.
Merge remote-tracking branch 'origin/master'