Latest state of development

Change-Id: Icc37c16ff1c4e1baec74e779c4af7174bd9daef1