Merge pull request from miroslavpejic85/main [talk] - fix display messages