Latest state of development

Change-Id: I2c42f81266e62b768fd572d3a4fd38c104f1708b