Latest state of development

Change-Id: If60f20e6cbbe6f6ad66ca7d2b4d8f48e8bddbe1e