Giving more namespaces to FlashMessager

This change was made by another user and excluded after for some reason. Just putting it back
Merge pull request #5839. Fix #5788 in master
Merge pull request #5633
Merge pull request #5633 in develop