Latest state of development

Change-Id: I852dc1657bc4bc3e9f0e3168ca19a7afc32c6a38