Latest state of development

Change-Id: Ic7335c270cfec4aad01f4d0cd69b431786397a56