shortcircuit rendering if no messages
shortcircuit rendering if no messages

fix git editor whitespace
Merge pull request #5768 in master
Merge pull request #5749
Merge pull request #5749 in develop