WIP changes 8 to synch with kilo

Change-Id: I737fcb357a3deeb1d32a3b1474ca4a736ce55044