Latest state of development

Change-Id: I4e9528e50756c02e107f46dd0beab310a8c90864