Fix potential bug in catchall.
Fix clock issue.
Merge branch 'develop' into feature/repl