WIP changes 14 to synch with kilo

Change-Id: Iaa9944f9fccb262d3e6ed53e8cd2134cdb01d6f1