Fix compilation for linux
Merge remote-tracking branch 'origin/timer' into capabilities