Merge branches 'thread_pool' and 'flatten_repeat_timer' into integration