Latest state of development

Change-Id: Ibae1bea4f9db4b138ed9fe512d1d112465c0a54b