Latest state of development

Change-Id: I98fcd2d38d1ad31443325063b9f088348a3c58f1