Latest state of development

Change-Id: I2f396f37540a7de602f8b34d8e2de96a5942a202