Latest state of development

Change-Id: I7482c893984feaf19314abf5ca386b2cfd2af5a9