Separated functions for instant and flash messages.
Merge remote-tracking branch 'origin/master'