Latest state of development

Change-Id: I0f268a24308ba14d3af49f08b49cba67febc8c90