WIP changes 5 to synch with kilo

Change-Id: Id4b6a2674a99f606aa16cb3bad463a10d2a34fd8