Latest state of development

Change-Id: I464659784baf06f4bfc7caefbcc90fdddc28e8e1