Merge branch 'release/0.9.5' into develop
Fixed flash messages
Updated dependencies