WIP changes 12 to synch with kilo

Change-Id: I4f0700e92c4f6982cb04ee6c4b291d57c815eb97