TimeoutAdd() main thread function
Merge branch 'develop'