Fixed repooling of old messages.
Merge branch 'test' into dev