complete message delivery
Merge branch 'raysmond'