Latest state of development

Change-Id: I83034e9ec962577945dd0c6708270f0bbdcca6d9
Latest state of development

Change-Id: I3b3744e8e3a02d5de390fe6bad02bd1d24359c08