Latest state of development

Change-Id: I9122abe2c912d59feeef6a15a7373981ac7c64de