wip 324 release

Change-Id: Ie677588cd06a36f4ba67a04efb29ff69bdb7855c