All the messages

Hopefully only changed the single lines

Fixxed the couple issues

More confilicts.....

Fixed merge issues
Merge pull request #886 from Fahv/TRUNK-2119-Non-Format

TRUNK-2119