Added the most recent INTERNAL messages.
Merge remote-tracking branch 'upstream/development' into development