WIP changes 6 to synch with kilo

Change-Id: I0baef13a69053a0f7850304a58e9d4d7654984ca