Finish merge freeRTOS v1