WIP changes 15 to synch with kilo

Change-Id: I1e04b68b7670daff2e4d5f7c235c11583b25135d