Fixed displaying messages
Merge branch 'release/1.5' into develop