Latest state of development

Change-Id: Id061a45184f72ee943acf0067f72dc137d82d471