WIP changes 3 to synch with kilo

Change-Id: Ic6309d676e71e76ff7455cb7fef067ff0271aef3