Latest state of development

Change-Id: I718756de4cb024d2f987f39d374ff2fbe6df2858