Latest state of development

Change-Id: I0d94d67108affaa322af75380594bbe81fe735f4