Merge branches 'work.sys_wait', 'misc.compat' and 'timers-compat' into work.compat