Latest state of development

Change-Id: I89810df9f535d57c3304817c611207f89119bdd0