Merged with latest autotimer from oe-aliance