Latest state of development

Change-Id: I3dfcbc2bcd199b2d369af8c71d9b249ecf2a5b30