Updated timeline_status match string order
Merge branch 'dev'