Latest state of development

Change-Id: I5e27e592de3e2efde2c29dce353e7b18eb15887c