Latest state of development

Change-Id: I46a27732e73711a0e3134339cb8e5a68010bc056