Merged with contiki version