Latest state of development

Change-Id: I2aee6f3bbd8a49956a7647df423d6a3b3a78a852