WIP changes 13 to synch with kilo

Change-Id: I6e9066ddbff33d4e3331b05dd70425454db265a2