hotfix on solve messages
Merge branch 'develop'