- Fix flash messages.
- Merge branch 'feature-fix-flash-messages' into 2-0-stable