Latest state of development

Change-Id: I62acd28cec8b33febce1c85d002bb3ed9d441cbc