Latest state of development

Change-Id: I75736fd220d059e85dfa5583f5d322917dadb178