First commit of odmbdev based on 13-07-28 me11dev