Clone of mh's rtos-master with local changes