Latest state of development

Change-Id: Ia2376731ac09ff38106a929971b0890575ad4950