Latest state of development

Change-Id: I06ff70ea91193204e71e384f39da4d4fa9599053