Latest state of development

Change-Id: Iade225cc7bf2daa8272ce8c23985ef2d3608ae26