Unfinished merge of Merge-L1-Onnet branch with develop branch of public OAI repository. Pending to resolve conflicts in multiple files.