Latest state of development

Change-Id: I9e62f21456dedf493431cf6120156ca547e0de42