Merge branch 'devel-timer' into devel-cleanup