Latest state of development

Change-Id: If4b2cad63662efadbc4370e250269371b47865be