Latest state of development

Change-Id: I6050ec18af42e7eca67c25afe915848ca5f21316