fixed ordering for history messages
Merge branch 'develop'