WIP changes 10 to synch with kilo

Change-Id: I561a527342571d3efae45126d21c05b67f5dbcf1