order by id, not time_created to improve performance
record failure reason
Merge branch 'master' into xmpp